From a36502c5a175e9bab517356425703df5918e0811 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Mon, 5 Sep 2011 12:48:26 +0300 Subject: [PATCH] * lisp/progmodes/grep.el (grep-process-setup): Fix comments. --- lisp/ChangeLog | 4 ++++ lisp/progmodes/grep.el | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8bdd23f0a45..344385df473 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2011-09-05 Juri Linkov + + * progmodes/grep.el (grep-process-setup): Fix comments (bug#8084). + 2011-09-05 Juri Linkov * progmodes/grep.el (grep-filter): Avoid incomplete processing by diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index eeebcc6648f..8cb3c314faf 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el @@ -446,9 +446,10 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'." (when (eq grep-highlight-matches 'auto-detect) (grep-compute-defaults)) (unless (or (eq grep-highlight-matches 'auto-detect) - ;; Uses font-lock to parse color escapes. (Bug#8084) - (null font-lock-mode) - (null grep-highlight-matches)) + (null grep-highlight-matches) + ;; Don't output color escapes if they can't be + ;; highlighted with `font-lock-face' by `grep-filter'. + (null font-lock-mode)) ;; `setenv' modifies `process-environment' let-bound in `compilation-start' ;; Any TERM except "dumb" allows GNU grep to use `--color=auto' (setenv "TERM" "emacs-grep") -- 2.30.2